From 5f8cd8b9fb473e18228e9c5af731ced283430d67 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 14 Sep 2007 02:11:01 +0000 Subject: [PATCH] Turn off icon cache validation by default svn path=/trunk/; revision=18823 --- ChangeLog | 5 +++++ gtk/gtkiconcache.c | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0580272f4..24603fecd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-13 Matthias Clasen + + * gtk/gtkiconcache.c: Turn off icon cache validation unless + icon theme debugging is turned on. + 2007-09-13 Matthias Clasen * configure.in: Bump version to 2.12.1 diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 7cce5083ae..021b64c898 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gchar *path) info.n_directories = 0; info.flags = CHECK_OFFSETS|CHECK_STRINGS; - if (!_gtk_icon_cache_validate (&info)) +#ifdef G_ENABLE_DEBUG + if (gtk_debug_flags & GTK_DEBUG_ICONTHEME) { - g_mapped_file_free (map); - g_warning ("Icon cache '%s' is invalid\n", cache_filename); + if (!_gtk_icon_cache_validate (&info)) + { + g_mapped_file_free (map); + g_warning ("Icon cache '%s' is invalid\n", cache_filename); - goto done; + goto done; + } } - +#endif + GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path)); cache = g_new0 (GtkIconCache, 1); -- 2.30.2